Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Provide the proper language to the mailer #20246

Merged
merged 1 commit into from
Apr 16, 2020
Merged

Provide the proper language to the mailer #20246

merged 1 commit into from
Apr 16, 2020
+42 −34

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Mar 31, 2020

Else we can't properly translate the footer in the recipients e-mail language.

  1. Create 2 users (userA and userB)
  2. set language of userB to something other than English
  3. share a file from userA to user B

before:

  • footer in language of userA

After:

  • footer in language of userB

@rullzer rullzer added bug 3. to review Waiting for reviews labels Mar 31, 2020
@rullzer rullzer added this to the Nextcloud 19 milestone Mar 31, 2020
ChristophWurst
ChristophWurst approved these changes Mar 31, 2020
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course 🙈

nickvergessen
nickvergessen requested changes Mar 31, 2020
View reviewed changes
Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in general, but the addFooter call should be fixed

lib/private/Share20/Manager.php Show resolved Hide resolved
lib/private/legacy/util.php Outdated Show resolved Hide resolved
@rullzer rullzer force-pushed the fix/untranslated_mail_footer branch from 5f22bf9 to 680da86 Compare March 31, 2020 12:18
@rullzer rullzer force-pushed the fix/untranslated_mail_footer branch from 680da86 to b8378c1 Compare April 1, 2020 07:01
@nickvergessen
Copy link
Member

There were 26 errors:

  1. Test\Mail\EMailTemplateTest::testEMailTemplateCustomFooter

TypeError: Argument 3 passed to OC\Mail\EMailTemplate::__construct() must implement interface OCP\L10N\IFactory, instance of Mock_IL10N_58c1d8ad given, called in /drone/src/tests/lib/Mail/EMailTemplateTest.php on line 54

This was referenced Apr 4, 2020
Merged
Merged
@rullzer rullzer force-pushed the fix/untranslated_mail_footer branch from b8378c1 to 673a5b6 Compare April 13, 2020 13:53
@nickvergessen
Copy link
Member

Lint / php-cs check (pull_request)

failing

@rullzer rullzer mentioned this pull request Apr 15, 2020
Merged
57 tasks
@rullzer rullzer force-pushed the fix/untranslated_mail_footer branch from b930115 to f2cbbf2 Compare April 16, 2020 06:44
nickvergessen
nickvergessen requested changes Apr 16, 2020
View reviewed changes
lib/private/Mail/EMailTemplate.php Outdated Show resolved Hide resolved
lib/private/legacy/OC_Defaults.php Outdated Show resolved Hide resolved
lib/public/Defaults.php Outdated Show resolved Hide resolved
lib/public/Mail/IEMailTemplate.php Outdated Show resolved Hide resolved
@rullzer
Provide the proper language to the mailer
bb4dedb 
Else we can't properly translate the footer in the recipients e-mail
language.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer force-pushed the fix/untranslated_mail_footer branch from f2cbbf2 to bb4dedb Compare April 16, 2020 07:04
@rullzer rullzer mentioned this pull request Apr 16, 2020
Merged
55 tasks
@rullzer
Copy link
Member Author

rullzer commented Apr 16, 2020

/backport to stable18

@rullzer
Copy link
Member Author

rullzer commented Apr 16, 2020

/backport to stable17

@rullzer rullzer merged commit fc2e17d into master Apr 16, 2020
@rullzer rullzer deleted the fix/untranslated_mail_footer branch April 16, 2020 08:06
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Apr 16, 2020
Merged
@backportbot-nextcloud
Copy link

backport to stable18 in #20512 with conflicts ⚠️

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Apr 16, 2020
Merged
@backportbot-nextcloud
Copy link

backport to stable17 in #20513 with conflicts ⚠️

@MorrisJobke MorrisJobke mentioned this pull request Apr 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen requested changes

@juliusknorr juliusknorr juliusknorr approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@georgehrke georgehrke georgehrke approved these changes

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug
Projects
None yet
Milestone
Nextcloud 19
Development

Successfully merging this pull request may close these issues.
5 participants
@rullzer @nickvergessen @georgehrke @ChristophWurst @juliusknorr